Deprecate widget flag: GTK_WIDGET_IS_SENSITIVE

Use gtk_widget_is_sensitive() instead

https://bugzilla.gnome.org/show_bug.cgi?id=69872

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 3c6f17b3953569c99c1eb4fcbc0f4e3c0996e74a..d2b56d0bfad6222c6e1c9bbb5d6f5ddbb57441f4 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -2180,7 +2180,7 @@ gtk_button_state_changed (GtkWidget    *widget,
 {
   GtkButton *button = GTK_BUTTON (widget);
 
-  if (!GTK_WIDGET_IS_SENSITIVE (widget))
+  if (!gtk_widget_is_sensitive (widget))
     {
       button->in_button = FALSE;
       gtk_real_button_released (button);

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 025860c345f4c73a8e7c4cde926c1fa783e2deff..c8d6c670164352b143d9a159c13b2642500d2328 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -1433,7 +1433,7 @@ calendar_realize_arrows (GtkCalendar *calendar)
          priv->arrow_win[i] = gdk_window_new (priv->header_win,
                                               &attributes, 
                                               attributes_mask);
-         if (GTK_WIDGET_IS_SENSITIVE (widget))
+         if (gtk_widget_is_sensitive (widget))
            priv->arrow_state[i] = GTK_STATE_NORMAL;
          else 
            priv->arrow_state[i] = GTK_STATE_INSENSITIVE;
@@ -3261,14 +3261,14 @@ gtk_calendar_state_changed (GtkWidget      *widget,
   GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
   int i;
   
-  if (!GTK_WIDGET_IS_SENSITIVE (widget))
+  if (!gtk_widget_is_sensitive (widget))
     {
       priv->in_drag = 0;
       calendar_stop_spinning (calendar);    
     }
 
   for (i = 0; i < 4; i++)
-    if (GTK_WIDGET_IS_SENSITIVE (widget))
+    if (gtk_widget_is_sensitive (widget))
       priv->arrow_state[i] = GTK_STATE_NORMAL;
     else 
       priv->arrow_state[i] = GTK_STATE_INSENSITIVE;

diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index 6d15a05b0e109c52692a8c82cadf034fe7043995..80e2f6979b105ada0a81633c1e2f2b014f7a354d 100644 (file)
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -390,7 +390,7 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
        state_type = GTK_STATE_ACTIVE;
       else if (button->in_button)
        state_type = GTK_STATE_PRELIGHT;
-      else if (!GTK_WIDGET_IS_SENSITIVE (widget))
+      else if (!gtk_widget_is_sensitive (widget))
        state_type = GTK_STATE_INSENSITIVE;
       else
        state_type = GTK_STATE_NORMAL;

diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index 4fb18c858a16b73f3aefc9f3d3eed4e1eb2d605b..1009833a9622ad9e5d4a6008b89318b15d8c728d 100644 (file)
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -488,7 +488,7 @@ gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
          else 
            shadow_type = GTK_SHADOW_OUT;
          
-         if (!GTK_WIDGET_IS_SENSITIVE (widget))
+         if (!gtk_widget_is_sensitive (widget))
            state_type = GTK_STATE_INSENSITIVE;
 
          if (check_menu_item->draw_as_radio)

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index f3e93d81048c5c9b42dbfd23272026f397743205..765df578881abaee60c51a43547ca491419c5edd 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -6447,7 +6447,7 @@ gtk_clist_focus (GtkWidget        *widget,
   GtkWidget *focus_child;
   gboolean is_current_focus;
 
-  if (!GTK_WIDGET_IS_SENSITIVE (widget))
+  if (!gtk_widget_is_sensitive (widget))
     return FALSE;
 
   focus_child = GTK_CONTAINER (widget)->focus_child;

diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index 083adc46b80b77c92876d3206478fc1c0d5accdd..f768d2e6e24e94a967e28118124ccaa56c22310b 100644 (file)
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -319,7 +319,7 @@ render (GtkColorButton *color_button)
       
     for (i = 0; i < width; i++) 
       {
-        if (!GTK_WIDGET_IS_SENSITIVE (GTK_WIDGET (color_button)) && (i+j)%2) 
+        if (!gtk_widget_is_sensitive (GTK_WIDGET (color_button)) && (i+j)%2)
           {
             *(pixels + j * rowstride + i * 3) = insensitive_r;
             *(pixels + j * rowstride + i * 3 + 1) = insensitive_g;

diff --git a/gtk/gtkcurve.c b/gtk/gtkcurve.c
index e49e5ff8c90a6a06ebe8a7c83bbba0d18b31807c..e1304dbd52cb88748b30e7226eead1aebc368187 100644 (file)
--- a/gtk/gtkcurve.c
+++ b/gtk/gtkcurve.c
@@ -380,7 +380,7 @@ gtk_curve_draw (GtkCurve *c, gint width, gint height)
     gtk_curve_interpolate (c, width, height);
 
   state = GTK_STATE_NORMAL;
-  if (!GTK_WIDGET_IS_SENSITIVE (GTK_WIDGET (c)))
+  if (!gtk_widget_is_sensitive (GTK_WIDGET (c)))
     state = GTK_STATE_INSENSITIVE;
 
   style = GTK_WIDGET (c)->style;

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 51299437161e073497e581470924f264edda5f1a..58a56703da4f94c10c36fce686da9be1a9e1c61c 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2619,7 +2619,7 @@ update_cursors (GtkWidget *widget)
            * here is that for the entry, insensitive => arrow cursor, but for 
            * an icon in a sensitive entry, insensitive => xterm cursor.
            */
-          if (GTK_WIDGET_IS_SENSITIVE (widget) && 
+          if (gtk_widget_is_sensitive (widget) &&
               (icon_info->insensitive || 
                (icon_info->nonactivatable && icon_info->target_list == NULL)))
             {
@@ -2779,7 +2779,7 @@ gtk_entry_realize (GtkWidget *widget)
 
   get_text_area_size (entry, &attributes.x, &attributes.y, &attributes.width, &attributes.height);
  
-  if (GTK_WIDGET_IS_SENSITIVE (widget))
+  if (gtk_widget_is_sensitive (widget))
     {
       attributes.cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), GDK_XTERM);
       attributes_mask |= GDK_WA_CURSOR;
@@ -3236,7 +3236,7 @@ draw_icon (GtkWidget            *widget,
   x = (width  - gdk_pixbuf_get_width (pixbuf)) / 2;
   y = (height - gdk_pixbuf_get_height (pixbuf)) / 2;
 
-  if (!GTK_WIDGET_IS_SENSITIVE (widget) ||
+  if (!gtk_widget_is_sensitive (widget) ||
       icon_info->insensitive)
     {
       GdkPixbuf *temp_pixbuf;
@@ -4250,7 +4250,7 @@ gtk_entry_state_changed (GtkWidget      *widget,
             gdk_window_set_background (icon_info->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
         }
 
-      if (GTK_WIDGET_IS_SENSITIVE (widget))
+      if (gtk_widget_is_sensitive (widget))
         cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), GDK_XTERM);
       else 
         cursor = NULL;
@@ -4265,7 +4265,7 @@ gtk_entry_state_changed (GtkWidget      *widget,
       update_cursors (widget);
     }
 
-  if (!GTK_WIDGET_IS_SENSITIVE (widget))
+  if (!gtk_widget_is_sensitive (widget))
     {
       /* Clear any selection */
       gtk_editable_select_region (GTK_EDITABLE (entry), entry->current_pos, entry->current_pos);      

diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index 546a5520b51bf4e3d04d675c310b1e319fa86f88..6ed49757b8f467bba5c86f7f3f8e5498e63ca17f 100644 (file)
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -955,7 +955,7 @@ static void
 gtk_expander_state_changed (GtkWidget    *widget,
                            GtkStateType  previous_state)
 {
-  if (!GTK_WIDGET_IS_SENSITIVE (widget))
+  if (!gtk_widget_is_sensitive (widget))
     GTK_EXPANDER (widget)->priv->button_down = FALSE;
 }
 

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 80e4d43850c83c2c01dd34e4a1b2c00321e4055a..5d9f0bf9ec2b31045fac819f27971f7ae880ba82 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -2385,9 +2385,9 @@ gtk_label_set_markup_internal (GtkLabel    *label,
 
       if (!(enable_mnemonics && priv->mnemonics_visible &&
             (!auto_mnemonics ||
-             (GTK_WIDGET_IS_SENSITIVE (label) &&
+             (gtk_widget_is_sensitive (GTK_WIDGET (label)) &&
               (!label->mnemonic_widget ||
-               GTK_WIDGET_IS_SENSITIVE (label->mnemonic_widget))))))
+               gtk_widget_is_sensitive (label->mnemonic_widget))))))
         {
           gchar *tmp;
           gchar *pattern;
@@ -2583,9 +2583,9 @@ gtk_label_set_pattern_internal (GtkLabel    *label,
 
       if (enable_mnemonics && priv->mnemonics_visible && pattern &&
           (!auto_mnemonics ||
-           (GTK_WIDGET_IS_SENSITIVE (label) &&
+           (gtk_widget_is_sensitive (GTK_WIDGET (label)) &&
             (!label->mnemonic_widget ||
-             GTK_WIDGET_IS_SENSITIVE (label->mnemonic_widget)))))
+             gtk_widget_is_sensitive (label->mnemonic_widget)))))
         attrs = gtk_label_pattern_to_attrs (label, pattern);
       else
         attrs = NULL;
@@ -3418,7 +3418,7 @@ gtk_label_update_cursor (GtkLabel *label)
       GdkDisplay *display;
       GdkCursor *cursor;
 
-      if (GTK_WIDGET_IS_SENSITIVE (label))
+      if (gtk_widget_is_sensitive (GTK_WIDGET (label)))
         {
           display = gtk_widget_get_display (GTK_WIDGET (label));
 
@@ -4721,7 +4721,7 @@ gtk_label_create_window (GtkLabel *label)
     GDK_POINTER_MOTION_MASK      |
     GDK_POINTER_MOTION_HINT_MASK;
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_NOREDIR;
-  if (GTK_WIDGET_IS_SENSITIVE (widget))
+  if (gtk_widget_is_sensitive (widget))
     {
       attributes.cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
                                                      GDK_XTERM);
@@ -6041,7 +6041,7 @@ gtk_label_activate_current_link (GtkLabel *label)
           if (window &&
               window->default_widget != widget &&
               !(widget == window->focus_widget &&
-                (!window->default_widget || !GTK_WIDGET_IS_SENSITIVE (window->default_widget))))
+                (!window->default_widget || !gtk_widget_is_sensitive (window->default_widget))))
             gtk_window_activate_default (window);
         }
     }

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index b150bf3e50d2ee01a0c09e05dd733276e1674a1d..660aed4379f8828305dc212b96e5d49de1a2c56f 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1519,7 +1519,7 @@ gtk_main_do_event (GdkEvent *event)
        *  then we send the event to the original event widget.
        *  This is the key to implementing modality.
        */
-      if (GTK_WIDGET_IS_SENSITIVE (event_widget) &&
+      if (gtk_widget_is_sensitive (event_widget) &&
          gtk_widget_is_ancestor (event_widget, grab_widget))
        grab_widget = event_widget;
     }
@@ -1650,13 +1650,13 @@ gtk_main_do_event (GdkEvent *event)
     case GDK_ENTER_NOTIFY:
       GTK_PRIVATE_SET_FLAG (event_widget, GTK_HAS_POINTER);
       _gtk_widget_set_pointer_window (event_widget, event->any.window);
-      if (GTK_WIDGET_IS_SENSITIVE (grab_widget))
+      if (gtk_widget_is_sensitive (grab_widget))
        gtk_widget_event (grab_widget, event);
       break;
       
     case GDK_LEAVE_NOTIFY:
       GTK_PRIVATE_UNSET_FLAG (event_widget, GTK_HAS_POINTER);
-      if (GTK_WIDGET_IS_SENSITIVE (grab_widget))
+      if (gtk_widget_is_sensitive (grab_widget))
        gtk_widget_event (grab_widget, event);
       break;
       
@@ -1759,7 +1759,7 @@ gtk_grab_notify_foreach (GtkWidget *child,
     {
       GTK_PRIVATE_SET_FLAG (child, GTK_SHADOWED);
       if (!was_shadowed && GTK_WIDGET_HAS_POINTER (child)
-         && GTK_WIDGET_IS_SENSITIVE (child))
+         && gtk_widget_is_sensitive (child))
        _gtk_widget_synthesize_crossing (child, info->new_grab_widget,
                                         GDK_CROSSING_GTK_GRAB);
     }
@@ -1767,7 +1767,7 @@ gtk_grab_notify_foreach (GtkWidget *child,
     {
       GTK_PRIVATE_UNSET_FLAG (child, GTK_SHADOWED);
       if (was_shadowed && GTK_WIDGET_HAS_POINTER (child)
-         && GTK_WIDGET_IS_SENSITIVE (child))
+         && gtk_widget_is_sensitive (child))
        _gtk_widget_synthesize_crossing (info->old_grab_widget, child,
                                         info->from_grab ? GDK_CROSSING_GTK_GRAB
                                         : GDK_CROSSING_GTK_UNGRAB);
@@ -1827,7 +1827,7 @@ gtk_grab_add (GtkWidget *widget)
   
   g_return_if_fail (widget != NULL);
   
-  if (!gtk_widget_has_grab (widget) && GTK_WIDGET_IS_SENSITIVE (widget))
+  if (!gtk_widget_has_grab (widget) && gtk_widget_is_sensitive (widget))
     {
       GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_GRAB);
       
@@ -2412,7 +2412,7 @@ gtk_propagate_event (GtkWidget *widget,
              window = gtk_widget_get_toplevel (widget);
              if (GTK_IS_WINDOW (window))
                {
-                 if (GTK_WIDGET_IS_SENSITIVE (window))
+                 if (gtk_widget_is_sensitive (window))
                    gtk_widget_event (window, event);
                }
            }
@@ -2436,7 +2436,7 @@ gtk_propagate_event (GtkWidget *widget,
           * to have children of the viewport eat the scroll
           * event
           */
-         if (!GTK_WIDGET_IS_SENSITIVE (widget))
+         if (!gtk_widget_is_sensitive (widget))
            handled_event = event->type != GDK_SCROLL;
          else
            handled_event = gtk_widget_event (widget, event);

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 31e92c3c93ac308aae5ba969254247e5485e4134..bfa6c81fabac3248be30da4148e7e39c33df3f64 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1804,7 +1804,7 @@ gtk_menu_real_can_activate_accel (GtkWidget *widget,
   if (awidget)
     return gtk_widget_can_activate_accel (awidget, signal_id);
   else
-    return GTK_WIDGET_IS_SENSITIVE (widget);
+    return gtk_widget_is_sensitive (widget);
 }
 
 /**

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 888883407d14224b5330cf5f5e823b60e823864a..5dc010b6f6f6520fcde6fb1da45dde3b84a1d125 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -1489,7 +1489,7 @@ gtk_menu_item_real_popup_submenu (GtkWidget *widget,
 {
   GtkMenuItem *menu_item = GTK_MENU_ITEM (widget);
 
-  if (GTK_WIDGET_IS_SENSITIVE (menu_item->submenu) && widget->parent)
+  if (gtk_widget_is_sensitive (menu_item->submenu) && widget->parent)
     {
       gboolean take_focus;
       GtkMenuPositionFunc menu_position_func;
@@ -1912,7 +1912,7 @@ gtk_menu_item_can_activate_accel (GtkWidget *widget,
                                  guint      signal_id)
 {
   /* Chain to the parent GtkMenu for further checks */
-  return (GTK_WIDGET_IS_SENSITIVE (widget) && GTK_WIDGET_VISIBLE (widget) &&
+  return (gtk_widget_is_sensitive (widget) && GTK_WIDGET_VISIBLE (widget) &&
           widget->parent && gtk_widget_can_activate_accel (widget->parent, signal_id));
 }
 
@@ -2101,7 +2101,7 @@ _gtk_menu_item_is_selectable (GtkWidget *menu_item)
   if ((!GTK_BIN (menu_item)->child &&
        G_OBJECT_TYPE (menu_item) == GTK_TYPE_MENU_ITEM) ||
       GTK_IS_SEPARATOR_MENU_ITEM (menu_item) ||
-      !GTK_WIDGET_IS_SENSITIVE (menu_item) ||
+      !gtk_widget_is_sensitive (menu_item) ||
       !GTK_WIDGET_VISIBLE (menu_item))
     return FALSE;
 

diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index c5e1c54b3bbf4c193920d282c4c94b3f5bec7f19..01444096265357f9193a942ea15f86248200acae 100644 (file)
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -152,7 +152,7 @@ gtk_menu_tool_button_state_changed (GtkWidget    *widget,
   GtkMenuToolButton *button = GTK_MENU_TOOL_BUTTON (widget);
   GtkMenuToolButtonPrivate *priv = button->priv;
 
-  if (!GTK_WIDGET_IS_SENSITIVE (widget) && priv->menu)
+  if (!gtk_widget_is_sensitive (widget) && priv->menu)
     {
       gtk_menu_shell_deactivate (GTK_MENU_SHELL (priv->menu));
     }

diff --git a/gtk/gtkmnemonichash.c b/gtk/gtkmnemonichash.c
index 51a9514510b7cd549109f8f0d819a9b964a86918..210002fb93befb2a3dcef73d368005eba0358168 100644 (file)
--- a/gtk/gtkmnemonichash.c
+++ b/gtk/gtkmnemonichash.c
@@ -127,7 +127,7 @@ _gtk_mnemonic_hash_activate (GtkMnemonicHash *mnemonic_hash,
     {
       widget = GTK_WIDGET (list->data);
       
-      if (GTK_WIDGET_IS_SENSITIVE (widget) &&
+      if (gtk_widget_is_sensitive (widget) &&
          GTK_WIDGET_MAPPED (widget) &&
           widget->window &&
          gdk_window_is_viewable (widget->window))

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index f86af0e8478e7ffa010735c7f9454dbf0c65be30..db873ce4e71d89c7d79e85f11616e41149ef47c7 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -3244,7 +3244,7 @@ static void
 gtk_notebook_state_changed (GtkWidget    *widget,
                            GtkStateType  previous_state)
 {
-  if (!GTK_WIDGET_IS_SENSITIVE (widget)) 
+  if (!gtk_widget_is_sensitive (widget))
     stop_scrolling (GTK_NOTEBOOK (widget));
 }
 

diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index 74d05547fd3db41ad99cdb01b7709f6f7027b9e2..7af0c7cfc85b47559d21b3b9feaf12ed3d2cd050 100644 (file)
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -729,8 +729,8 @@ gtk_option_menu_item_state_changed_cb (GtkWidget      *widget,
 {
   GtkWidget *child = GTK_BIN (option_menu)->child;
 
-  if (child && GTK_WIDGET_SENSITIVE (child) != GTK_WIDGET_IS_SENSITIVE (widget))
-    gtk_widget_set_sensitive (child, GTK_WIDGET_IS_SENSITIVE (widget));
+  if (child && GTK_WIDGET_SENSITIVE (child) != gtk_widget_is_sensitive (widget))
+    gtk_widget_set_sensitive (child, gtk_widget_is_sensitive (widget));
 }
 
 static void
@@ -771,7 +771,7 @@ gtk_option_menu_update_contents (GtkOptionMenu *option_menu)
          child = GTK_BIN (option_menu->menu_item)->child;
          if (child)
            {
-             if (!GTK_WIDGET_IS_SENSITIVE (option_menu->menu_item))
+             if (!gtk_widget_is_sensitive (option_menu->menu_item))
                gtk_widget_set_sensitive (child, FALSE);
              gtk_widget_reparent (child, GTK_WIDGET (option_menu));
            }
@@ -1014,7 +1014,7 @@ gtk_option_menu_scroll_event (GtkWidget          *widget,
 
          l = g_list_nth (GTK_MENU_SHELL (option_menu->menu)->children, index);
          item = GTK_MENU_ITEM (l->data);
-         if (GTK_WIDGET_VISIBLE (item) && GTK_WIDGET_IS_SENSITIVE (item))
+         if (GTK_WIDGET_VISIBLE (item) && gtk_widget_is_sensitive (GTK_WIDGET (item)))
            {
              gtk_option_menu_set_history (option_menu, index);
              gtk_menu_item_activate (GTK_MENU_ITEM (item));

diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 428476f1d9d3bb9156371ada771bb763481e38ea..48f72e0b9db501831d2278c575fb38f3983a5dfd 100644 (file)
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -997,7 +997,7 @@ gtk_paned_realize (GtkWidget *widget)
                            GDK_POINTER_MOTION_MASK |
                            GDK_POINTER_MOTION_HINT_MASK);
   attributes_mask = GDK_WA_X | GDK_WA_Y;
-  if (GTK_WIDGET_IS_SENSITIVE (widget))
+  if (gtk_widget_is_sensitive (widget))
     {
       attributes.cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
                                                      paned->cursor_type);
@@ -1280,7 +1280,7 @@ gtk_paned_state_changed (GtkWidget    *widget,
 
   if (GTK_WIDGET_REALIZED (paned))
     {
-      if (GTK_WIDGET_IS_SENSITIVE (widget))
+      if (gtk_widget_is_sensitive (widget))
         cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
                                              paned->cursor_type); 
       else

diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index a9d2da39005e918def0b3bb32b1fdfee5cc804de..b86a8f421d97bd8bb57c55278f29f135c62a601b 100644 (file)
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -936,7 +936,7 @@ gtk_path_bar_slider_up_defocus (GtkWidget      *widget,
     }
 
   /* don't let the focus vanish */
-  if ((!GTK_WIDGET_IS_SENSITIVE (path_bar->up_slider_button)) || 
+  if ((!gtk_widget_is_sensitive (path_bar->up_slider_button)) ||
       (!gtk_widget_get_child_visible (path_bar->up_slider_button)))
     gtk_widget_grab_focus (BUTTON_DATA (up_button->data)->button);
 
@@ -964,7 +964,7 @@ gtk_path_bar_slider_down_defocus (GtkWidget      *widget,
     }
 
   /* don't let the focus vanish */
-  if ((!GTK_WIDGET_IS_SENSITIVE (path_bar->down_slider_button)) || 
+  if ((!gtk_widget_is_sensitive (path_bar->down_slider_button)) ||
       (!gtk_widget_get_child_visible (path_bar->down_slider_button)))
     gtk_widget_grab_focus (BUTTON_DATA (down_button->data)->button);
 
@@ -1036,7 +1036,7 @@ static void
 gtk_path_bar_state_changed (GtkWidget    *widget,
                            GtkStateType  previous_state)
 {
-  if (!GTK_WIDGET_IS_SENSITIVE (widget)) 
+  if (!gtk_widget_is_sensitive (widget))
     gtk_path_bar_stop_scrolling (GTK_PATH_BAR (widget));
 }
 

diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index bee3cdfe2d9a2dfcefd6c154acb7b453224876d3..bee86318efbc80a923630d7e61bce865f49b9374 100644 (file)
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -2434,7 +2434,7 @@ dialog_set_print_pages (GtkPrintUnixDialog *dialog,
 static gdouble
 dialog_get_scale (GtkPrintUnixDialog *dialog)
 {
-  if (GTK_WIDGET_IS_SENSITIVE (dialog->priv->scale_spin))
+  if (gtk_widget_is_sensitive (dialog->priv->scale_spin))
     return gtk_spin_button_get_value (GTK_SPIN_BUTTON (dialog->priv->scale_spin));
   else
     return 100.0;
@@ -2450,7 +2450,7 @@ dialog_set_scale (GtkPrintUnixDialog *dialog,
 static GtkPageSet
 dialog_get_page_set (GtkPrintUnixDialog *dialog)
 {
-  if (GTK_WIDGET_IS_SENSITIVE (dialog->priv->page_set_combo))
+  if (gtk_widget_is_sensitive (dialog->priv->page_set_combo))
     return (GtkPageSet)gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->priv->page_set_combo));
   else
     return GTK_PAGE_SET_ALL;
@@ -2467,7 +2467,7 @@ dialog_set_page_set (GtkPrintUnixDialog *dialog,
 static gint
 dialog_get_n_copies (GtkPrintUnixDialog *dialog)
 {
-  if (GTK_WIDGET_IS_SENSITIVE (dialog->priv->copies_spin))
+  if (gtk_widget_is_sensitive (dialog->priv->copies_spin))
     return gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (dialog->priv->copies_spin));
   return 1;
 }
@@ -2483,7 +2483,7 @@ dialog_set_n_copies (GtkPrintUnixDialog *dialog,
 static gboolean
 dialog_get_collate (GtkPrintUnixDialog *dialog)
 {
-  if (GTK_WIDGET_IS_SENSITIVE (dialog->priv->collate_check))
+  if (gtk_widget_is_sensitive (dialog->priv->collate_check))
     return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->collate_check));
   return FALSE;
 }
@@ -2499,7 +2499,7 @@ dialog_set_collate (GtkPrintUnixDialog *dialog,
 static gboolean
 dialog_get_reverse (GtkPrintUnixDialog *dialog)
 {
-  if (GTK_WIDGET_IS_SENSITIVE (dialog->priv->reverse_check))
+  if (gtk_widget_is_sensitive (dialog->priv->reverse_check))
     return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->reverse_check));
   return FALSE;
 }

diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index 503fdb0f7a71000db59f972c03ca7b7da34f7489..2fcba3bb157eee2a6fab38e5c9ca7bfa30b9f2af 100644 (file)
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -498,7 +498,7 @@ gtk_radio_button_focus (GtkWidget         *widget,
            {
              GtkWidget *child = tmp_list->data;
              
-             if (GTK_WIDGET_MAPPED (child) && GTK_WIDGET_IS_SENSITIVE (child))
+             if (GTK_WIDGET_MAPPED (child) && gtk_widget_is_sensitive (child))
                {
                  new_focus = child;
                  break;
@@ -534,7 +534,7 @@ gtk_radio_button_focus (GtkWidget         *widget,
            {
              GtkWidget *child = tmp_list->data;
              
-             if (GTK_WIDGET_MAPPED (child) && GTK_WIDGET_IS_SENSITIVE (child))
+             if (GTK_WIDGET_MAPPED (child) && gtk_widget_is_sensitive (child))
                {
                  new_focus = child;
                  break;
@@ -719,7 +719,7 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
        state_type = GTK_STATE_ACTIVE;
       else if (button->in_button)
        state_type = GTK_STATE_PRELIGHT;
-      else if (!GTK_WIDGET_IS_SENSITIVE (widget))
+      else if (!gtk_widget_is_sensitive (widget))
        state_type = GTK_STATE_INSENSITIVE;
       else
        state_type = GTK_STATE_NORMAL;

diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 5059a242e96f1a0ff7a8100c45bb0551758db0d5..624a52ef6ea8e47173934fe7f03164f5e675fb63 100644 (file)
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -1652,7 +1652,7 @@ draw_stepper (GtkRange     *range,
       arrow_sensitive = range->layout->lower_sensitive;
     }
 
-  if (!GTK_WIDGET_IS_SENSITIVE (range) || !arrow_sensitive)
+  if (!gtk_widget_is_sensitive (GTK_WIDGET (range)) || !arrow_sensitive)
     state_type = GTK_STATE_INSENSITIVE;
   else if (clicked)
     state_type = GTK_STATE_ACTIVE;
@@ -1741,7 +1741,7 @@ gtk_range_expose (GtkWidget      *widget,
   gtk_range_calc_marks (range);
   gtk_range_calc_layout (range, range->adjustment->value);
 
-  sensitive = GTK_WIDGET_IS_SENSITIVE (widget);
+  sensitive = gtk_widget_is_sensitive (widget);
 
   /* Just to be confusing, we draw the trough for the whole
    * range rectangle, not the trough rectangle (the trough
@@ -2541,7 +2541,7 @@ static void
 gtk_range_state_changed (GtkWidget    *widget,
                         GtkStateType  previous_state)
 {
-  if (!GTK_WIDGET_IS_SENSITIVE (widget)) 
+  if (!gtk_widget_is_sensitive (widget))
     stop_scrolling (GTK_RANGE (widget));
 }
 

diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index cc2e70d50fffbf2b6b780fd544de1a48e94fffc6..70fd4297ba543c252a7b66f887b8c082911293ec 100644 (file)
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -973,7 +973,7 @@ gtk_scale_expose (GtkWidget      *widget,
   GTK_WIDGET_CLASS (gtk_scale_parent_class)->expose_event (widget, event);
 
   state_type = GTK_STATE_NORMAL;
-  if (!GTK_WIDGET_IS_SENSITIVE (widget))
+  if (!gtk_widget_is_sensitive (widget))
     state_type = GTK_STATE_INSENSITIVE;
 
   if (priv->marks)

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index e9349cd07d806bba4d33e121e8d743c4cfdc9e1c..792b40226f0dd8ed4ce49f13f18b0de4619307a0 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -966,7 +966,7 @@ gtk_spin_button_state_changed (GtkWidget    *widget,
 {
   GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
 
-  if (!GTK_WIDGET_IS_SENSITIVE (widget))
+  if (!gtk_widget_is_sensitive (widget))
     {
       gtk_spin_button_stop_spinning (spin);    
       gtk_widget_queue_draw (GTK_WIDGET (spin));

diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index 59b25ea27e1c4d4eefc6af2cef6379c4c2a28bf6..c8300633d174a8e4c0c6c383b52d6c0931784dea 100644 (file)
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -231,7 +231,7 @@ gtk_spinner_expose (GtkWidget      *widget,
     gtk_widget_set_size_request (widget, 12, 12);
 
   state_type = GTK_STATE_NORMAL;
-  if (!GTK_WIDGET_IS_SENSITIVE (widget))
+  if (!gtk_widget_is_sensitive (widget))
    state_type = GTK_STATE_INSENSITIVE;
 
   gtk_paint_spinner (widget->style,

diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index eda9caae0d9158595b371ce5756487503ee4381f..125efef98be0d548d2d76a8897b31b41bece4542 100644 (file)
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -647,7 +647,7 @@ set_grip_cursor (GtkStatusbar *statusbar)
       GdkCursorType cursor_type;
       GdkCursor *cursor;
       
-      if (GTK_WIDGET_IS_SENSITIVE (widget))
+      if (gtk_widget_is_sensitive (widget))
         {
           if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
            cursor_type = GDK_BOTTOM_RIGHT_CORNER;

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 703001c026073500490a48ff99fc637e12f0fe53..9bea6e4b1cdae203005565969a6d7006f1fdc9c2 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4012,7 +4012,7 @@ gtk_text_view_state_changed (GtkWidget      *widget,
     {
       gtk_text_view_set_background (text_view);
 
-      if (GTK_WIDGET_IS_SENSITIVE (widget))
+      if (gtk_widget_is_sensitive (widget))
         cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), GDK_XTERM);
       else
         cursor = NULL;
@@ -4025,7 +4025,7 @@ gtk_text_view_state_changed (GtkWidget      *widget,
       text_view->mouse_cursor_obscured = FALSE;
     }
 
-  if (!GTK_WIDGET_IS_SENSITIVE (widget))
+  if (!gtk_widget_is_sensitive (widget))
     {
       /* Clear any selection */
       gtk_text_view_unselect (text_view);
@@ -8030,7 +8030,7 @@ text_window_realize (GtkTextWindow *win,
 
   if (win->type == GTK_TEXT_WINDOW_TEXT)
     {
-      if (GTK_WIDGET_IS_SENSITIVE (widget))
+      if (gtk_widget_is_sensitive (widget))
         {
           /* I-beam cursor */
           cursor = gdk_cursor_new_for_display (gdk_drawable_get_display (widget->window),

diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c
index 1cc74b02f6ba8525aefb1cd45ee668a917f3a595..ef14f562fa4dc7ed6bb693d02c58386034ca665a 100644 (file)
--- a/gtk/gtktreeitem.c
+++ b/gtk/gtktreeitem.c
@@ -187,7 +187,7 @@ gtk_tree_item_subtree_button_click (GtkWidget *widget)
   g_return_val_if_fail (GTK_IS_EVENT_BOX (widget), FALSE);
   
   item = (GtkTreeItem*) gtk_object_get_user_data (GTK_OBJECT (widget));
-  if (!GTK_WIDGET_IS_SENSITIVE (item))
+  if (!gtk_widget_is_sensitive (GTK_WIDGET (item)))
     return FALSE;
   
   if (item->expanded)
@@ -614,7 +614,7 @@ gtk_tree_item_paint (GtkWidget    *widget,
        }
       else 
        {
-         if (!GTK_WIDGET_IS_SENSITIVE (widget)) 
+         if (!gtk_widget_is_sensitive (widget))
            gtk_paint_flat_box(widget->style, widget->window,
                               widget->state, GTK_SHADOW_NONE,
                               area, widget, "treeitem",
@@ -665,11 +665,11 @@ gtk_tree_item_button_press (GtkWidget      *widget,
                            GdkEventButton *event)
 {
   if (event->type == GDK_BUTTON_PRESS
-       && GTK_WIDGET_IS_SENSITIVE(widget)
+       && gtk_widget_is_sensitive(widget)
        && !GTK_WIDGET_HAS_FOCUS (widget))
       gtk_widget_grab_focus (widget);
 
-  return (event->type == GDK_BUTTON_PRESS && GTK_WIDGET_IS_SENSITIVE(widget));
+  return (event->type == GDK_BUTTON_PRESS && gtk_widget_is_sensitive(widget));
 }
 
 static void
@@ -761,7 +761,7 @@ gtk_real_tree_item_toggle (GtkItem *item)
 {
   g_return_if_fail (GTK_IS_TREE_ITEM (item));
 
-  if(!GTK_WIDGET_IS_SENSITIVE(item))
+  if(!gtk_widget_is_sensitive(GTK_WIDGET (item)))
     return;
 
   if (GTK_IS_TREE (GTK_WIDGET (item)->parent))

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 8bb723717d9a416d30c9a91f2f042f0c6c4296eb..1ae215624a2278129be2ec09e6742f071d29d0b4 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -7996,7 +7996,7 @@ gtk_tree_view_focus (GtkWidget        *widget,
   GtkContainer *container = GTK_CONTAINER (widget);
   GtkWidget *focus_child;
 
-  if (!GTK_WIDGET_IS_SENSITIVE (container) || !gtk_widget_get_can_focus (widget))
+  if (!gtk_widget_is_sensitive (widget) || !gtk_widget_get_can_focus (widget))
     return FALSE;
 
   focus_child = container->focus_child;

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index a7b9f4260f11d9300e7ef5ced070a31605dba606..e40d4439a698011a1a9aa27f7e06032df43a40c6 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4299,7 +4299,9 @@ gtk_widget_real_can_activate_accel (GtkWidget *widget,
                                     guint      signal_id)
 {
   /* widgets must be onscreen for accels to take effect */
-  return GTK_WIDGET_IS_SENSITIVE (widget) && gtk_widget_is_drawable (widget) && gdk_window_is_viewable (widget->window);
+  return gtk_widget_is_sensitive (widget) &&
+         gtk_widget_is_drawable (widget) &&
+         gdk_window_is_viewable (widget->window);
 }
 
 /**
@@ -4655,7 +4657,7 @@ gtk_widget_mnemonic_activate (GtkWidget *widget,
   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
 
   group_cycling = group_cycling != FALSE;
-  if (!GTK_WIDGET_IS_SENSITIVE (widget))
+  if (!gtk_widget_is_sensitive (widget))
     handled = TRUE;
   else
     g_signal_emit (widget,
@@ -5268,7 +5270,7 @@ gtk_widget_grab_focus (GtkWidget *widget)
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  if (!GTK_WIDGET_IS_SENSITIVE (widget))
+  if (!gtk_widget_is_sensitive (widget))
     return;
   
   g_object_ref (widget);
@@ -5795,7 +5797,7 @@ gtk_widget_set_state (GtkWidget           *widget,
       data.state_restoration = FALSE;
       data.use_forall = FALSE;
       if (widget->parent)
-       data.parent_sensitive = (GTK_WIDGET_IS_SENSITIVE (widget->parent) != FALSE);
+       data.parent_sensitive = (gtk_widget_is_sensitive (widget->parent) != FALSE);
       else
        data.parent_sensitive = TRUE;
 
@@ -6250,7 +6252,7 @@ gtk_widget_set_sensitive (GtkWidget *widget,
   data.use_forall = TRUE;
 
   if (widget->parent)
-    data.parent_sensitive = (GTK_WIDGET_IS_SENSITIVE (widget->parent) != FALSE);
+    data.parent_sensitive = (gtk_widget_is_sensitive (widget->parent) != FALSE);
   else
     data.parent_sensitive = TRUE;
 
@@ -6299,7 +6301,7 @@ gtk_widget_is_sensitive (GtkWidget *widget)
 {
   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
 
-  return GTK_WIDGET_IS_SENSITIVE (widget);
+  return gtk_widget_is_sensitive (widget);
 }
 
 /**
@@ -6345,8 +6347,8 @@ gtk_widget_set_parent (GtkWidget *widget,
   else
     data.state = GTK_WIDGET_STATE (widget);
   data.state_restoration = FALSE;
-  data.parent_sensitive = (GTK_WIDGET_IS_SENSITIVE (parent) != FALSE);
-  data.use_forall = GTK_WIDGET_IS_SENSITIVE (parent) != GTK_WIDGET_IS_SENSITIVE (widget);
+  data.parent_sensitive = (gtk_widget_is_sensitive (parent) != FALSE);
+  data.use_forall = gtk_widget_is_sensitive (parent) != gtk_widget_is_sensitive (widget);
 
   gtk_widget_propagate_state (widget, &data);
   
@@ -7661,7 +7663,7 @@ gtk_widget_child_focus (GtkWidget       *widget,
   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
 
   if (!GTK_WIDGET_VISIBLE (widget) ||
-      !GTK_WIDGET_IS_SENSITIVE (widget))
+      !gtk_widget_is_sensitive (widget))
     return FALSE;
 
   /* child widgets must set CAN_FOCUS, containers
@@ -9184,7 +9186,7 @@ gtk_widget_propagate_state (GtkWidget           *widget,
   else
     GTK_WIDGET_UNSET_FLAGS (widget, GTK_PARENT_SENSITIVE);
 
-  if (GTK_WIDGET_IS_SENSITIVE (widget))
+  if (gtk_widget_is_sensitive (widget))
     {
       if (data->state_restoration)
         GTK_WIDGET_STATE (widget) = widget->saved_state;
@@ -9203,7 +9205,7 @@ gtk_widget_propagate_state (GtkWidget           *widget,
       GTK_WIDGET_STATE (widget) = GTK_STATE_INSENSITIVE;
     }
 
-  if (gtk_widget_is_focus (widget) && !GTK_WIDGET_IS_SENSITIVE (widget))
+  if (gtk_widget_is_focus (widget) && !gtk_widget_is_sensitive (widget))
     {
       GtkWidget *window;
 
@@ -9217,14 +9219,14 @@ gtk_widget_propagate_state (GtkWidget           *widget,
     {
       g_object_ref (widget);
 
-      if (!GTK_WIDGET_IS_SENSITIVE (widget) && gtk_widget_has_grab (widget))
+      if (!gtk_widget_is_sensitive (widget) && gtk_widget_has_grab (widget))
        gtk_grab_remove (widget);
 
       g_signal_emit (widget, widget_signals[STATE_CHANGED], 0, old_state);
 
       if (GTK_WIDGET_HAS_POINTER (widget) && !GTK_WIDGET_SHADOWED (widget))
        {
-         if (!GTK_WIDGET_IS_SENSITIVE (widget))
+         if (!gtk_widget_is_sensitive (widget))
            _gtk_widget_synthesize_crossing (widget, NULL, 
                                             GDK_CROSSING_STATE_CHANGED);
          else if (old_state == GTK_STATE_INSENSITIVE)
@@ -9234,7 +9236,7 @@ gtk_widget_propagate_state (GtkWidget           *widget,
 
       if (GTK_IS_CONTAINER (widget))
        {
-         data->parent_sensitive = (GTK_WIDGET_IS_SENSITIVE (widget) != FALSE);
+         data->parent_sensitive = (gtk_widget_is_sensitive (widget) != FALSE);
          if (data->use_forall)
            gtk_container_forall (GTK_CONTAINER (widget),
                                  (GtkCallback) gtk_widget_propagate_state,

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 33bf3f1c87227df8b5c4474a1924d7e80bae2265..00d47ac8ea5ace1680fdd57857058bb4b4109d04 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -268,14 +268,18 @@ typedef enum
  */
 #define GTK_WIDGET_PARENT_SENSITIVE(wid)  ((GTK_WIDGET_FLAGS (wid) & GTK_PARENT_SENSITIVE) != 0)
 
+#ifndef GTK_DISABLE_DEPRECATED
 /**
  * GTK_WIDGET_IS_SENSITIVE:
  * @wid: a #GtkWidget.
  *
  * Evaluates to %TRUE if the widget is effectively sensitive.
+ *
+ * Deprecated: 2.20: Use gtk_widget_is_sensitive() instead.
  */
 #define GTK_WIDGET_IS_SENSITIVE(wid)     (GTK_WIDGET_SENSITIVE (wid) && \
                                           GTK_WIDGET_PARENT_SENSITIVE (wid))
+#endif
 
 #ifndef GTK_DISABLE_DEPRECATED
 /**

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 38c713a4328b4997e1bd0d0103bacc9697a16c75..fa98b8c7f05a5a623abb264f8e5c891b681150ff 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -1968,7 +1968,7 @@ gtk_window_activate_focus (GtkWindow *window)
 {
   g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
 
-  if (window->focus_widget && GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
+  if (window->focus_widget && gtk_widget_is_sensitive (window->focus_widget))
     return gtk_widget_activate (window->focus_widget);
 
   return FALSE;
@@ -2010,10 +2010,10 @@ gtk_window_activate_default (GtkWindow *window)
 {
   g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
 
-  if (window->default_widget && GTK_WIDGET_IS_SENSITIVE (window->default_widget) &&
+  if (window->default_widget && gtk_widget_is_sensitive (window->default_widget) &&
       (!window->focus_widget || !gtk_widget_get_receives_default (window->focus_widget)))
     return gtk_widget_activate (window->default_widget);
-  else if (window->focus_widget && GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
+  else if (window->focus_widget && gtk_widget_is_sensitive (window->focus_widget))
     return gtk_widget_activate (window->focus_widget);
 
   return FALSE;
@@ -5173,7 +5173,7 @@ gtk_window_propagate_key_event (GtkWindow        *window,
     {
       GtkWidget *parent;
       
-      if (GTK_WIDGET_IS_SENSITIVE (focus))
+      if (gtk_widget_is_sensitive (focus))
         handled = gtk_widget_event (focus, (GdkEvent*) event);
       
       parent = focus->parent;

diff --git a/modules/other/gail/gailbutton.c b/modules/other/gail/gailbutton.c
index 2c72d2f183855e49015e662d9491f5a0602047bb..d4fcf4dc87c9791b97e173331b56313808c284f7 100644 (file)
--- a/modules/other/gail/gailbutton.c
+++ b/modules/other/gail/gailbutton.c
@@ -459,7 +459,7 @@ gail_button_do_action (AtkAction *action,
      */
     return FALSE;
 
-  if (!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
+  if (!gtk_widget_is_sensitive (widget) || !GTK_WIDGET_VISIBLE (widget))
     return FALSE;
 
   button = GAIL_BUTTON (action); 
@@ -505,7 +505,7 @@ idle_do_action (gpointer data)
   g_object_ref (gail_button);
 
   if (widget == NULL /* State is defunct */ ||
-      !GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
+      !gtk_widget_is_sensitive (widget) || !GTK_WIDGET_VISIBLE (widget))
     {
       g_object_unref (gail_button);
       return FALSE;

diff --git a/modules/other/gail/gailexpander.c b/modules/other/gail/gailexpander.c
index 99d8c4a38fe53ea2c931f67f583ad16bf87e4266..c4b7cd2be3ed8f374d30de74af991bb86df1bfc5 100644 (file)
--- a/modules/other/gail/gailexpander.c
+++ b/modules/other/gail/gailexpander.c
@@ -374,7 +374,7 @@ gail_expander_do_action (AtkAction *action,
      */
     return FALSE;
 
-  if (!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
+  if (!gtk_widget_is_sensitive (widget) || !GTK_WIDGET_VISIBLE (widget))
     return FALSE;
 
   expander = GAIL_EXPANDER (action);
@@ -404,7 +404,7 @@ idle_do_action (gpointer data)
 
   widget = GTK_ACCESSIBLE (gail_expander)->widget;
   if (widget == NULL /* State is defunct */ ||
-      !GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
+      !gtk_widget_is_sensitive (widget) || !GTK_WIDGET_VISIBLE (widget))
     return FALSE;
 
   gtk_widget_activate (widget);

diff --git a/modules/other/gail/gailscalebutton.c b/modules/other/gail/gailscalebutton.c
index 32cb12eea9b984bc6689a3692e2704ccba06f35a..956543cbcbe7b056b3b3f72e9881ce9b4f76bcdb 100644 (file)
--- a/modules/other/gail/gailscalebutton.c
+++ b/modules/other/gail/gailscalebutton.c
@@ -115,7 +115,7 @@ gail_scale_button_do_action(AtkAction *action,
   if (widget == NULL)
     return FALSE;
 
-  if (!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
+  if (!gtk_widget_is_sensitive (widget) || !GTK_WIDGET_VISIBLE (widget))
     return FALSE;
 
   switch (i) {

diff --git a/modules/other/gail/gailwidget.c b/modules/other/gail/gailwidget.c
index 9a7e5df9ca8f205939abd125a3684ae25874b269..ea69cc777e270978c3a25b8f98e4c03953fea441 100644 (file)
--- a/modules/other/gail/gailwidget.c
+++ b/modules/other/gail/gailwidget.c
@@ -482,7 +482,7 @@ gail_widget_ref_state_set (AtkObject *accessible)
     }
   else
     {
-      if (GTK_WIDGET_IS_SENSITIVE (widget))
+      if (gtk_widget_is_sensitive (widget))
         {
           atk_state_set_add_state (state_set, ATK_STATE_SENSITIVE);
           atk_state_set_add_state (state_set, ATK_STATE_ENABLED);

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 05afc5d52f1c6ad67ff6fd3e34ef01de08400549..d2a5b5dbc14216543b97077e06189017882e5c9c 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -2896,7 +2896,7 @@ create_sensitivity_control (GtkWidget *widget)
   button = gtk_toggle_button_new_with_label ("Sensitive");  
 
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
-                                GTK_WIDGET_IS_SENSITIVE (widget));
+                                gtk_widget_is_sensitive (widget));
   
   g_signal_connect (button,
                     "toggled",